From fd96117f72e0a668005a85d11d7291ae72b39828 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 6 Jan 2006 21:49:59 +0000 Subject: [PATCH] Just use the directory name for the home dir. (#325817, Federico Mena 2006-01-06 Matthias Clasen * gtk/gtkfilechooserbutton.c (model_add_special): Just use the directory name for the home dir. (#325817, Federico Mena Quintero) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkfilechooserbutton.c | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98ad383160..a7bc2bf527 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-06 Matthias Clasen + * gtk/gtkfilechooserbutton.c (model_add_special): Just use the + directory name for the home dir. (#325817, Federico Mena Quintero) + * gtk/gtktexttag.c (gtk_text_attributes_new): Initialize editable to TRUE. (gtk_text_tag_class_init): The default value for the direction diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 98ad383160..a7bc2bf527 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-01-06 Matthias Clasen + * gtk/gtkfilechooserbutton.c (model_add_special): Just use the + directory name for the home dir. (#325817, Federico Mena Quintero) + * gtk/gtktexttag.c (gtk_text_attributes_new): Initialize editable to TRUE. (gtk_text_tag_class_init): The default value for the direction diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index ed8472d315..18c3d97fcf 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -65,7 +65,6 @@ #define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonPrivate)) #define DEFAULT_TITLE N_("Select A File") -#define HOME_DISPLAY_NAME N_("Home") #define DESKTOP_DISPLAY_NAME N_("Desktop") #define FALLBACK_DISPLAY_NAME N_("(None)") #define FALLBACK_ICON_NAME "stock_unknown" @@ -1331,6 +1330,7 @@ static inline void model_add_special (GtkFileChooserButton *button) { const gchar *homedir; + const gchar *display_name; gchar *desktopdir = NULL; GtkListStore *store; GtkTreeIter iter; @@ -1346,6 +1346,7 @@ model_add_special (GtkFileChooserButton *button) if (homedir) { path = gtk_file_system_filename_to_path (button->priv->fs, homedir); + display_name = get_display_name_for_path (button->priv->fs, path); pixbuf = gtk_file_system_render_icon (button->priv->fs, path, GTK_WIDGET (button), button->priv->icon_size, NULL); @@ -1353,7 +1354,7 @@ model_add_special (GtkFileChooserButton *button) pos++; gtk_list_store_set (store, &iter, ICON_COLUMN, pixbuf, - DISPLAY_NAME_COLUMN, _(HOME_DISPLAY_NAME), + DISPLAY_NAME_COLUMN, display_name, TYPE_COLUMN, ROW_TYPE_SPECIAL, DATA_COLUMN, path, -1); -- 2.30.2